From: Julien Grall Date: Wed, 5 Feb 2014 14:16:34 +0000 (+0000) Subject: xen/arm: Correctly implement domain_page_map_to_mfn X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5619 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=65f3c7ef39e197fe90e2440730292f291a86cf98;p=xen.git xen/arm: Correctly implement domain_page_map_to_mfn The function domain_page_map_to_mfn can be used to translate a virtual address mapped by both map_domain_page and map_domain_page_global. The former is using vmap to map the mfn, therefore domain_page_map_to_mfn will always fail because the address is not in DOMHEAP range. Check if the address is in vmap range and use __pa to translate it. This patch fix guest shutdown when the event fifo is used. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell Cc: George Dunlap --- diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 127cce0f50..bdca68a1d4 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -325,11 +325,15 @@ void unmap_domain_page(const void *va) local_irq_restore(flags); } -unsigned long domain_page_map_to_mfn(const void *va) +unsigned long domain_page_map_to_mfn(const void *ptr) { + unsigned long va = (unsigned long)ptr; lpae_t *map = this_cpu(xen_dommap); - int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; - unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + int slot = (va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; + unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) + return virt_to_mfn(va); ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); ASSERT(map[slot].pt.avail != 0);